[IMP] Style improvements