Some code cleanup using astyle