lint
indent
minor refactoring
add control address