re-apply comments and remove some of the shortcuts for easier reading