redundant function removed, added filepath constants