Add comments, refactoring
Merge pull request #1 from dameleon/feature/refactoring

Add comments, refactoring