Comstock renovation will take less than a year