Minor code and imports cleanup