add comments and check style