Improved documentation, formatting