Some initial formatting change. Tested successfully.