Created some constants and did some housekeeping.