Cleaned formatting, more verbose comments.