[*] Code cleanup