Tried cleaning up code.