Minor code cleanings