Cleaned up fs