~ refactorings and more comments