Minor changes, cleaning up ugly, crappy, shitty code