Pull attrs first so they can have spaces

Also added some more comments