Various Reformatting and Alterations

Working on readability and efficiency.