Removed unnecessary string variables and made them inline