Remove blank lines
Remove unnecessary error checking