cleanup code layout
Merge branch 'cleanup-code'