refactoring, better usage for parameterless scopes (boolean params), 2 more specs