Minor refactoring
Modified logger to log req and res to same place