Interface updated
div. cleanup