Removing redundant code
Moving things into includes.