Minor Cleanup on FIRST + About Templates