added additional info statements and removed redundant code