Refactoring, streamlining and FSD fixes