Clean up code
Merge remote-tracking branch 'origin/marcus-0.7.2-branch'