Minor refactoring to fix for issue #46 for code clarity.