small refactoring
done Owy7MIzd, added spb metro