Added latest style-guide updates