indent fix (and pull out some id's to env variables)