small code hint and refactors