Refactored scope and cpplint