Style improvements to resemble the rest of IO