minor clean up and a fix for a warning i was getting