minor changes and styles