add expire configuration option + some comment cleanup