Cleared out unnecessary comments and whitespace