Refactoring: moved action methods and made some local vars into member vars
merged refactoring