Updated Code Aesthetics

This has still not been tested! (Refer to the previous update.)