Alex Zajichek and Alex Zajichek Consolidated some redundant code