Constanst added + renamed variables using hava name convensions