Minor changes to fix style