Code reformat and imports opt
Request listener changed, added loading