v0.2 Code clearing (Thanks Kharec)