small fixing, improvements, reformat ...