Refactor @ various