Simplify by using elastic module
Simplify by using elastic module

This relates to #456
jimjag/ponymail,jimjag/ponymail,Humbedooh/ponymail,Humbedooh/ponymail,Humbedooh/ponymail,jimjag/ponymail,quenda/ponymail,jimjag/ponymail,quenda/ponymail,quenda/ponymail