Wow. major refactoring. indeed!
Code refactoring... again
Housekeeping and Code cleanup