Refactored bounds and transformation logic