Cleanup and movment fix