make code comply with conventions