Removed hardcoded values specific to my initial use-case