removed unnecessary tests from content and made attrs methods private