Minor refactorings, removing unneccesary comments