Replaced hard coded items with use of params/args