Hardcoding removal

removed some hard coded elements