More refactoring, usage of constructors