Clean interface

by JY.May