Removed Zero function and fixed static constant values into their appropriate style