Took care of Clean Code