Add final variables and comments