Refactoring specs, outlining how I would like to improve this project