- moved most constants to separate file - sorted and cleaned-up imports - moved logging setup to separate file