Huge cleanup of variable names, more stripping away nonsense