Cleanup & formatting