post code review clean up