Removed some debug stuff and some whitespace