Some cosmetic changes
Merge Lijuan's and Sharlene's code