refactor code to use base class implementation

remove duplicated code in order to simplify maintenance
Merge pull request #1 from sb-relaxt-at/master

refactor code to use base class implementation