Update Code after scrutinizer