Finished class editing