Rename functions for better readability
Update comments, delete unnecessary comments
Merge branch 'refactoring'
Release v0.11