Added arc throw and cleaned up code/files.