Updated documentation, formatting