diff --git a/src/logic/PlayerController.cpp b/src/logic/PlayerController.cpp
index 1ebe8d0a..1479b6f5 100644
--- a/src/logic/PlayerController.cpp
+++ b/src/logic/PlayerController.cpp
@@ -32,11 +32,11 @@ const float CROUCH_SHIFT_Y = -0.2f;
 
 
 CameraControl::CameraControl(std::shared_ptr<Player> player, const CameraSettings& settings) 
-    : player(player), 
-      camera(player->camera), 
-      currentViewCamera(player->currentCamera),
-      settings(settings),
-      offset(0.0f, 0.7f, 0.0f) {
+  : player(player), 
+    camera(player->camera), 
+    currentViewCamera(player->currentCamera),
+    settings(settings),
+    offset(0.0f, 0.7f, 0.0f) {
 }
 
 void CameraControl::refresh() {
diff --git a/src/logic/PlayerController.h b/src/logic/PlayerController.h
index 2bf3c437..e1ae47e4 100644
--- a/src/logic/PlayerController.h
+++ b/src/logic/PlayerController.h
@@ -12,43 +12,43 @@ class Level;
 class BlocksController;
 
 class CameraControl {
-	std::shared_ptr<Player> player;
-	std::shared_ptr<Camera> camera, currentViewCamera;
-	const CameraSettings& settings;
-	glm::vec3 offset;
-	float shake = 0.0f;
-	float shakeTimer = 0.0f;
-	glm::vec3 interpVel {0.0f};
+    std::shared_ptr<Player> player;
+    std::shared_ptr<Camera> camera, currentViewCamera;
+    const CameraSettings& settings;
+    glm::vec3 offset;
+    float shake = 0.0f;
+    float shakeTimer = 0.0f;
+    glm::vec3 interpVel {0.0f};
 public:
-	CameraControl(std::shared_ptr<Player> player, const CameraSettings& settings);
-	void updateMouse(PlayerInput& input);
-	void update(PlayerInput& input, float delta, Chunks* chunks);
-	void refresh();
+    CameraControl(std::shared_ptr<Player> player, const CameraSettings& settings);
+    void updateMouse(PlayerInput& input);
+    void update(PlayerInput& input, float delta, Chunks* chunks);
+    void refresh();
 };
 
 class PlayerController {
-	Level* level;
-	std::shared_ptr<Player> player;
-	PlayerInput input;
-	CameraControl camControl;
+    Level* level;
+    std::shared_ptr<Player> player;
+    PlayerInput input;
+    CameraControl camControl;
     BlocksController* blocksController;
 
-	void updateKeyboard();
-	void updateCamera(float delta, bool movement);
-	void resetKeyboard();
-	void updateControls(float delta);
-	void updateInteraction();
+    void updateKeyboard();
+    void updateCamera(float delta, bool movement);
+    void resetKeyboard();
+    void updateControls(float delta);
+    void updateInteraction();
 public:
-	static glm::vec3 selectedBlockPosition;
-	static glm::ivec3 selectedBlockNormal;
-	static glm::vec3 selectedPointPosition;
-	static int selectedBlockId;
-	static int selectedBlockStates;
+    static glm::vec3 selectedBlockPosition;
+    static glm::ivec3 selectedBlockNormal;
+    static glm::vec3 selectedPointPosition;
+    static int selectedBlockId;
+    static int selectedBlockStates;
 
-	PlayerController(Level* level, 
+    PlayerController(Level* level, 
                      const EngineSettings& settings,
                      BlocksController* blocksController);
-	void update(float delta, bool input, bool pause);
+    void update(float delta, bool input, bool pause);
 
     Player* getPlayer();
 };
diff --git a/src/voxels/Block.cpp b/src/voxels/Block.cpp
index 0b3491bd..dd4ff3bf 100644
--- a/src/voxels/Block.cpp
+++ b/src/voxels/Block.cpp
@@ -2,10 +2,8 @@
 
 #include "../core_defs.h"
 
-using glm::vec3;
-
 CoordSystem::CoordSystem(glm::ivec3 axisX, glm::ivec3 axisY, glm::ivec3 axisZ)
-	: axisX(axisX), axisY(axisY), axisZ(axisZ)
+  : axisX(axisX), axisY(axisY), axisZ(axisZ)
 {
 	fix = glm::ivec3(0);
 	if (isVectorHasNegatives(axisX)) fix -= axisX;
@@ -14,9 +12,9 @@ CoordSystem::CoordSystem(glm::ivec3 axisX, glm::ivec3 axisY, glm::ivec3 axisZ)
 }
 
 void CoordSystem::transform(AABB& aabb) const {
-	vec3 X(axisX);
-	vec3 Y(axisY);
-	vec3 Z(axisZ);
+	glm::vec3 X(axisX);
+	glm::vec3 Y(axisY);
+	glm::vec3 Z(axisZ);
 	aabb.a = X * aabb.a.x + Y * aabb.a.y + Z * aabb.a.z;
 	aabb.b = X * aabb.b.x + Y * aabb.b.y + Z * aabb.b.z;
 	aabb.a += fix;