renamed some methods
Merge branch 'refactor'