move to fragments
misc
code convention