[0.3.3] Clean up code