template and interior style cleaning up