Cleaned up comments (reverted from commit 6b29858827f518bc7c4f94ead7dac7f5c87f515e)