Enhancement: clean-up