Revised assignment rules

I prefer non aligned assignment except in certain circumstances where I feel aligning the equal signs improves readability.