Minor indentation changes and whatnot