Minor changes, coding style