Getting rid of some redundant code.