Small changes before class