Some slight style changes