cleanup and simplify circle shader