Update 2.3.1 - Making the code a bit more readable