Remove dead code
Fix camel case, add some comment