code cleanup, adding some effects