Better codestructure