Cleaned stuff up a bit
Whoops