Cleanup

Doing a little bit of code cleanup