Improve structure and looks