Feature/cleanup constants