Fixed Formatting Issues