Optimize whitespaces
Declare first, export last
Use `bind()`
Update comments
Merge branch 'code-refactoring'