not a merge stopper. the code alignment is weird and makes reading harder.