minor code improvements in core module
Merge pull request #46 from voltrue2/develop

minor code improvements in core module