Mostly code organization, QOL and comments.