Minor refactorings. Altered classes' constructor.