Refactor specs, fix spacing