code tidy and comment update