adopting hlint's suggestions.