Change to follow best practices