Small improvements, code cleanings.