cursory refactor, involving spacing and removing functionality