#39 Done and some cleaning.