Further Tidying and Speed Improvements
Added/Removed Comments