[D#480] Cleanup and minor changes