added jenkins handler and cleaned up a little bit