Removed redunant action invoker
Improved overall syntax