Code cleanup
There should be no change in operation with this commit