whitespace and cleanup, generally trying to keep it below 80 characters per line