Fix some syntax
Revert function shortcut