Review Changes - Removed button variables as members from class