Slimming down code. Wheee
Cleaned up code a little bit