Added a few more descriptive variable names, cleared out superfluous comments