Cleanup and reformatting