Added dox for last Handlers, renamed and cleaned up the inline code