Fixed Formatting/Errors