import values from file + some refactor