fs2 refactor
fs2 refactoring