[MOD]Code Improvement; adding info inspector