Refactor of features

Quick refactor for travis test