Removed all Hard Coded Constants