most of the changes in this file are me being antsy about indentation