Improved readability a little by reordering definitions in class