Removed some unnecessary string formatting