Review/astyle

Run astyle on the code in preparation for v0.7 release