* Some cleanup and finishing