code cleanup, improved situation for values