Added Header Returns

Added headers and cleaned up un-needed code