Formatted Code, Clean-up