Kostas - refactoring of constructor