Cleanup and comments... :zzz: