Remove comments and fixed indentation