Improve documentation, formatting