Added comment-free version.