basic code cleanup plus added action-element