Refactorings w/ suggestions from Josh