cleanup, removed useless code.

improved presentation.