better naming, clean code