Unify style

Still needs to be refactored with astyle