Formatting and string bug fix