Removed comments, moved action invokation