Removed hardcoded values
Fixed hardcoding issues