Cleanup 1

A bit of code cleanup