Clean ups based on code review feedback