Improve documentation, code style