Refactoring all methods.
Merge pull request #1 from eug/patch-1

Refactoring all methods.