Moved all constants to a config file, code clean-up