Styling sorted and http handler
cleaned up