fix comments, remove unnecessary fns