Further code cleaning toward transformation to standard setting