Fixed reservations entirely and cleaned code