Removing some of the hard coded values

but adding some others which may need to be pulled out into options in
classes.