More cleanup and rework