Removed repeated code
Merge pull request #13 from rodrigjg/Areesha

good stuff much less code in each trait class