cleanup formatting with astyle (supersedes #18)