Cleaned up injection code.