Adding Str Class & Refactoring