Minor: Code formating, cosmetic, etc.