minor code changes
Merge branch 'structuring'