implemented annotation to disable variable expansion on  method level and on class level
cleanup