fix layout and comments