style and small changes