Refactoring. Better comments.
Merge commit 'c8421cc'