more simplification, removed unneeded object structure