cleanup
make idea aware of provided scope
cleanup / indent / code style
code style
add tests
process extra