Fixed collision checking for keyboard input
Added Getter & Setter functions. Refactored and cleaned up code.