* Cleanup and tuning of previous commit