[#56] Minor clean up