[B-52097]:  formatting the code and organizing the imports