This fixes the errors and cleans the output even more :)