Improve format and documentation