Unhardcode commIface
Refactor some code