removed redundant code to make it easier to read