Program template cleanup

Cleans up program templates kinda