Clean code and annotation retention policy modified to source