Making changes per code review (thanks @jamiehannaford!)