Removed lots of exits; fixed some whitespace issues