removed slight redundant code