refactor - reduce appearance of 'Side'
make the types simpler, remove some dead code
whitespace
more tidying