Cleaning up component code