Tidy up project following `modern' go style