Code reorganization
Capitalizations