Simplified and cleaned up
Cleaned up