Refactor Spray formatting for traits
More spray refactoring