added tcomment and cleaned up