Some restructuring and cleanup
Testing Done:
Issue Number:
Approved by:
Reviewed by: