Order style

several commits include #279