More tidyup, thanks hlint!