minor refactorings/improvements and a bit more of comments