Cleaned up whitespaces and indents