Refactored long methods in Maritime Trade