Replaced constants by readonly