Changed the way attributes were handled (don't set as symbols), formatting fixes