Cleanup code formatting (mostly whitespace)