Improved integration/basic code quality