minor clean-ups, thanks hlint!