Fs refactor