minor refactor of old base project