Moving constant to appropriate place