Made small refactorings