refactor: code beautification

Code changes on multiple places to make code
nicer a better readable.