Little refactoring
Added String class