removed redundant code, better function names