Reverted the code to readable instead of optimized