Added performance improvement ideas

Removed and added some comments