Cleaned up a lot of code from assignment 3, no bubble tea :(

Changed variable names, deleted comments etc. because I actually get it now