code layout
code layout
refactoring; code layout; some todos