[cleanup] Use more diamonds
[cleanup] Added missing @since and @version
[cleanup] Use the right order for modifiers