Code Clean UP

Pod and code clean up