Tidy up - add missing semi-colons etc