Cleaned Up Formatting