Implemented holoMove and cleaned up code