Made changes after running code validator