Add comments, minor cleanup