Style Update

STYLE UPDATE SS18