Utilising more modern Java, simplifying code and formatting code and comments This comment #327 (PART 1)