Clean up. Make things more readable.