Updated formatting using astyle