Changed static final values to private