Do some cleanup and make changes according to previous code review