More code polishing