Add some better code. Clean up old, unnecessary code.