Removing hard-coded variable