Fixing #45, sub-optimal indentation with attributes