Basic tidyups
Merge pull request #1 from smallepic/muan

Basic tidyups.