Clean up indentation

Follow the convention of one indentation level per enclosed class or module.