fuel report + refactoring