Maintenance

-Added/Edited comments
-Cleaned up some formatting