Cleanup/Organize attributes
Break up some long lines
Use [] instead of Array.new