Re organise script / cleanup whitespace