cleaning up and reorganizing constants