Formatting changes and removing string conversion