Lil bit of tidying and reading of mes