Better code structure

[amnk]

Using interfaces helps avoid the copy-paste in the code, which is cool :)