Clean up code. Make better.