Some PEP8 changes, new warehouse map