Minor refactoring and renaming.
Merge branch 'master' of https://github.com/pavelgj/chopin