Code cleanup and refactor
Progress code cleanup and refactor
Progress code cleanup & refactor
Code cleanup & refactor