Removed some unnecessary casts and string appends
2 files changed