Lots of Refactoring on the Codebase except Specs