mostly cosmetic/spacing/astyle