improving comments and looking for improvements