cleaned up the code a bit more

next to work on the button senses.