Cleaning up da code