Cleaned up version of the work to arrive to LibNeubot v3.1