cleaning code (i saw some errors :expressionless: )