Made Movement follow coding guidelines