Cleaning + indent code