improved style and assignment handling