Cleaning up cruft and whitespace