Got rid of duplicate metro pass. Cleaned up logic