Cleanup

Cleans up output formatting line breaks. Addresses a bug whereby equipped items were not being removed from storage and unequipping items did not add them back to storage. Changes a few if/else statements into switch statements.