Initial pass at updating and cleanup