Added remaining changes from code review