Cleanup

Thanks PeterCxy!