First refactoring of refuel code
Further refactoring of reservations
Further refactoring of reservation related code