Code refactored and changed tint color