Cleaned up whitespace/format