Address review comments and tidy up