Extracted leftover strings into constants, code formated again.
Working contribution of beans