Removing Hardcodings