Added check for checking in/out using a different carrier
Removed Simulator class
Fixed naming (hyphens vs underscores)