Little code format improvements