before model composition
general code cleanup