Cleaned up code  + Fixed Bug on Up & Down Key

> Added comments