Code Cleanup
Merge pull request #27 from ST-DDT/CodeCleanup

Code Cleanup