More keypress modifications
A little bit of keypress oragnizing
Doing a little bit of code cleanup