configuration
configuration
fix smelly code