use scopes instead of class methods
whitespace cleanup