trying to clean up the codez.