Bringing in line with best practices