Review comments & refactorings