Some cleanups and comments
Ultra huge mega important change