Renamed Dmitry to Arthur. Some cleanup