Specs cleaned up