- refactoring for modularizing issue
- removed syntax failure