moved all single-file constants away from Consts
fixed indentation, ecc