Removed some string concatenations for speed