more constantization and removal of extra line