just improve spec layout a bit