removed method and renamed constants