Formatting and Cleaenup