general clean up based on code review