Reorganized Code & Comments

Final assignment submission version.