Code clean-up in Select Extensions