Refactor code for improved readability and performance across multiple modules 0393dfa ThreadAbort commited on Nov 16