Refactoring; reduced sloc