Minor style changes - mostly spacing for readability