more changes to comply with new style guidlines