Fix style issues pointed out by @soc