Re-indent and put deprecated notice in couple lines