Increased Code Quality

* All three files code quality improved