some code clean-up for the custom_info