Further work + stripped pointless whitespace