Simplified + Cleanup