Some cleanup and refactoring...
Merge pull request #383 from Kenny9999/development

Some cleanup and refactoring...