fix style throughout