Cleaning up/modifying code.