Source formatting fixes