Added fixes for astyle