Flo class refactored