Redueced string usage
Fixed issue