Small clean up
Cleaned up some code