Optimized the code constants a bit