Clean up component code