Optional updates and code cleaning