Cleanup
More code polishing