Refactor spacing. Attr accessors