code formatting + code cleanup