action parsing simplified and renamed