Clean up & formatting