Cleanup code

[pengilton]

This is a very low priority issue. There is basically no need for this but clean code is always good,