cleanup and small change