Refactored bagage to baggage and… some other stuff