some code cleanup
Merge branch 'structuring'