Code is prettier and mode robust