Cleaned the interface