Code style cleanup.

Need to fix the loading bar to load in the correct order too.