Performed additional code cleaning based on feedback.