Improving on jflinter's contribution to simplify the class and provide a single point for future enhancements without breaking changes