Refactor fsstas