Performed some code clean up on analyzer factory