More indentation and documentation
More fixing and docs