[cleanup] Replace tab with spaces
[cleanup] White space cleanup
[misc] Refactoring for better variable names, better performance