- Organized some variables to provide easier maintainability - Removed some unused/irrelevant code - Moved extra flag memory reads inside the extra flags check, to ensure it only reads memory for those flags, when enabled, improving performance by reducing number of memory reads when NOT using extra flags