Clean up the set command

Various messy places of the set command cleaned up / made more consistent.
Merge pull request #34 from panpawn/patch-12

Clean up the set command