better format and comments