some commenting done