Made String Constants and removed extra components