Clean up redundent code