String interpolation for constants.
renaming etc
clean up