Clean up

Also added ZXP fie for easy usage!