Initial plugin style improved