Minor changes
Code layout changes
Minor change