Reminder Tests + beautifying code a bit