Code cleanup
Rename action type
Add pragma mark