Gonna Float out the damn window in a few

cleaned up a lot of code. Makes more sense this way