Some cleanup & continued work