Cleaning up code #2