Implemented move method, cleaned code