More interface improvements and code tidy ups