Slight style modifications