mild cleanup of initial commit