minor re-structuring