Suggested Changes

Mild code cleanup and performance increase. Discussed further in each commit.