UCLO back working, refactoring, print improvment