Cleaner code. wall moves