Minor changes, over this assignment now haha