2nd commit
Clean paint code