Comments updates and @return added.