[#8] PR cleanup