Fixed some hardcode values

Change hardcode values with constants