Refactor for new error classes
Add whitespace
Create basic errors