Minor edits

Indentation and stuff, pulling updates