Moved mousePos to gameState
Code cleanup and refactoring