closer to the python code + some cleanup