Some cleanup (unused imports), naming