minor changes, organized