Minor fixes and beautifying.