Minor clean up, use constants