Adding some better coding from exercises