Code Organize

Trivial Changes