#4 - remove constants from class