Second wave of code clean