refactor, made current and format instance vars