eliminated some unecessary code