Additional Cleanup and logic consolidation