Just a few more indent changes and rearranging of functions.