just some edits...
major clean up, simplification