Change: Improved code quality (hopefully)