init: minor clean up