Update code to conform against hound rules