Minor improvements.

+Code structure reorganization.