Small refactoring and add player movement