* cleaned up redundant code