constants; cleanup