Refactors spec files and cleans up comments