[ADD] Some style changes