Make loading code readable; mostly whitespace changes.