minor refactoring as well as block commenting handled