Some more code quality