Improve code readbility over main class