[functions.constant] some modifications
[functions] some cleanup