remove unnessary @true, and create some macros to clean things up