More refactoring and finally, camera like in the original game!