General polish and cleanup