Bug in reservations fixed + some refactoring