Restructure handler and add black formatter

Restructure handler and add black formatter #14