code cleaning: add const for default values etc