Brett - Framework and style updates.