TIDIED. COMMENTED.. HOPEFULLY FINAL