Multiple code cleanings