Minor tweaks - sorted inconsistent brackets, excess imports etc