consolidated filenames and removed redundant code