Fix code uniformity