Updated comments, moved to one line