e0031 - correct but ugly
e0031 - shortened to the required code