Re-did some earlier changes for clarity

Almost all changes are in comments