Refactor and added constants class