Slight cleanup
Some more cleanup