Change code style of the variant builder to PSR-2