Minor refactor and portability