Code reorganization
Cosmetical changes