Added Comments/Removed Dead Code