minor changes in solution organization