Refactoring Combustibles.java and Combustible.java