Major cleanup and parsing positions