InfoCommands: Code Cleanup