cleanup
added config and handler