More code format cleanup
Better action name