Slight aesthetic changes