Still cleaning up code.