some minor code cleanings