:rage2: cleaning the code