Make some cleanup, left last 2 sections at the bottom unchanged. Aaron to finalize before packaging and submission.