Do minor cleanup