cleaned up redundancy.