Code beauty upgrade