Comments + some refactoring