Cleaned up movement