Made attributes cleaner