Fix indent code and unnecessary comments