More reformatting & optimising