cleanup to make lints happy(er)