Refactor; rebuild

removed 1 extraneous function