Code quality improved

* All three files code quality improved