code refactoring
Merge pull request #49 from vatseek/remarks

code refactoring