improvements in UI
remove unused code, remove obsolete comments, organize imports