Minor code refactoring
Merge pull request #144 from joshuaabenazer/master

Minor Code Refactoring