Improve docs and formatting