Small fixes

Here are some suggested changes to the code so far. Thanks and happy coding! :smile: