Removed all hard-coded variables, for the sake of consistency.