values in separated file, header files cleanup