fixed issue with tint color, code clean up