cleaned up with a config