Cleared up a bit of code after a review from maria