minor fix; Refactor to better fit the error structure
Add some styling