Refactor mrblib
Update TODO