Minor refactoring
Clean comments