Add comments and remove commented code.