Refactor - created Figure interface