code cleanup
Merge branch 'master' of https://github.com/fuzzyaxioms/dual_aim
merged