cleaned up code per code review