improve generation app parameters and code cleanup