Code cleanup
Interface tweak