Formated code better with Astyle