Going to clean up the code.