add final and rename for variables