cleaned up whitespaces and indentation