Code Cleanup

Simple commit to test pull request with tscharlii