Performance increased;
Cleaned up