Clean up.
More cleanup.
cleaning..
Structure changes and some idea on related work lead-in.