Cleaned up file system a bit