Fix FS init.
Merge pull request #10 from StapleButter/refactor

Fix FS init.