Added comments; renamed constants to fit convention