Finished refractoring