Improved attributes implementation

 - remove double checks
 - add comments