Revamp of Design

Remove double quotes in the rest of this file