get rid of superflous function and add comment