Add spaces for better readability
Get rid of separate errors file
Fix requirement of missing file