Clean up. Better code.