Optimised and enhanced readability of the command parser