Start to cleanup the interface a little bit