Cleaned up Oose's code

Was kind of gross, able to condense a lot while still keeping it
readable