moved some commenting