Clean up method names, add comments, handle removing components