Fixed some commenting