Cleaned up whitespaces, comments and blank lines