Fixed #4. Clean up.