Fix Style errors