Code cleanup and effect visual fixes