Minor code clean
Minor clean ups.