Code cleanup and more effects