improve encapsulation into the Fireplay class and removing unused importing references