Various cleanup and sugar