minor code cleanings