Some moves
Merge pull request #122 from zznate/morecleanup

Some moves