Code improvements. Includes optimized code (Meaning we lessend the code)