less javascript, more python [MJ-487]
test passing [MJ-487]