tidying up architecture sketch