[misc] Improved codestyle, fixed bad "unmodifiable" transformation