Minor cleanups, Less magic numbers.