refactoring, cleaning up code

see String actionName in methods