Fixed Stringy Errors

Fixed errors detected by Stringy tool