Updating code! Simplifying some things