Add UIColor category and cleanup
More cleanup