Lint

Fixing some lint stuff. Still need to add logic for graceful recovery of I/O failures.