FINAL COMMIT: edited formatting and removed superfluous commenting