[#66] Minor clean up