More testing, trying to clean the code.