Refactoring.
Merge remote-tracking branch 'extendedmind/master'