[Ide][Feature] Refactoring and some code normalization
Removed linq queries and used linq extensions.
Normalization.