Initial cleanup

A bunch of initial cleanup work