Simplify action checking, formatting