More code quality and documentation