lint and polish I
minor improvements