Interface cleanup

Code interface cleanup