refactoring
Merge pull request #210 from Team-Delta/cleanup

refactoring
merge fixes