More refactoring of the methods and playing