CoP 6-4 Fixes - Code Cleanup

-Remove unnecessary switch statement
-Avoid duplicating add title